Revision: bazaar--devo--1.4--patch-23
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Tue Apr 19 06:28:32 BST 2005
Standard-date: 2005-04-19 05:28:32 GMT
Modified-files: commands/status.c
New-patches: Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-4
    jblack@gnuarch.org--2005/baz--authentication--1.3--patch-14
    jblack@gnuarch.org--2005/baz--authentication--1.3--patch-15
    jblack@gnuarch.org--2005/baz--authentication--1.3--patch-16
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-67
    thelove@canonical.com/bazaar--devo--1.3--patch-75
    thelove@canonical.com/bazaar--devo--1.3--patch-76
    thelove@canonical.com/bazaar--devo--1.4--patch-23
Removed-patches: jblack@gnuarch.org--2005/baz--sftpauto--1.4--base-0
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-1
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-2
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-3
Summary: status sometimes lied about conflicts (Mattheiu Moy)
Keywords: 

Patches applied:

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-4
   Avoid panic in arch_cmd_status()

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-14
   merge from upstream

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-15
   Sometimes status lied about conflicts (fix from Matthieu Moy)

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-16
   Merging from upstream (again)

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-67
   merge in update correctness. ancestry aggresiveness reduction, and get scan reduction

 * thelove@canonical.com/bazaar--devo--1.3--patch-75
   merge in update correctness. ancestry aggresiveness reduction, and get scan reduction

 * thelove@canonical.com/bazaar--devo--1.3--patch-76
   bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.

